adapted to Costello's draft design