added changes to feat1.1