final changes to usercf