Adding missing modifications in branch