revised and added tasks