refactored TODOs
daily execution and anded issue