Merge branch 'changeClassWithoutReset'
Hopefully fixed all merge problems