:rage: stupid changes to try to make it mwork