Added day of the week & some refactoring