friday's changes, uncommitted :(