some refactored finished and added hourly support