biggest changes, #1, #2, #5, #6