refact#2.1