undid fixes that didn't work