daily update, refactored code
daily update