committing some changes I haven't committed, apparently