Moved changing classes to other script