refactored, seemingly succesfully.