Combined 3.1 and 3.2 into a single task