my first squash commit! Closes #5c9b02d