I've added the additional changes to Delilah's CS.