Made all tasks + optimization