everything as of 2nd draft