moved into class