Added more code to UHCCommand