Corrections after Tej's update, now functional for Issue #161