some changes
some changes reverted back