added and adjusted tasks#178