Small changes

Working on shift class