changed constants into class