removed changes from unmerged code - 2