version 2

move at the bottom of the class