added UPS and modified some units