moved code to account for new users