More small steps to make delegates work.