Fixed Johs shitty stuff