More notes, just a bit of added code