Add a few more things, remove assignments from DO.