some updates in branch feature1