Rewrote some tasks