added changes
changes for before merge