trying to fix all the things!