merging various changes back