Committing some changes I made a few months ago