Managed to remove some unneccassary checks