Edits to accomodate new user points scheme