eng-18 #comment some changes