More upper bounds #370 #384