lots of changes made on the first run through