partially changed everything to use the instance variable for current user