Updated for tutorial 60 + assimp loader