Added (hopefully) the correct unit scaling