Special thanks to Amir for legitimately helping out with this update