Changed loading classes... wonder where I got those from ;)