@crazyrohila do I need to remove the extra fixes from the above patch?