Second opinion for 2.1 module

Second opinion for 2.1 module