attempting to fix stuff - mabye?