Removed all the str's... didn't need 'em after all