revert merging of codes from 2 sources