LAST MINUTE FIXES AAAAHHHHHHHHH