Still trying to minimize the calls to `arrange`