SIM-65 Trying to make everything work again