Div. changes for v.1.2