Update Changes

lorex feedback changes