Matching the improvements from Locker