Started merging USM code with main code