Possible Code Changes For Tickets #41 #76