Work in progress pretify US
Fixed conflicts