Added descriptions for subtasks 1 and 2 as well as s-invariants