[NF] Continue work on task (#2).