choice stuff, changes to other classes