Changed double dateOfWork to int dateOfWork in severl places