modified tasks for a more smarter behavior on changes