mass refactoring
added hours