work in progress on tasks + change few fields names