Feature uss hooks

merging hooks back to uss