This UnitsError still needs fixing (sorry, I commented on the wrong one before)