fixed reloading & transitioning to new classes