Changes

Two commits in this PR...no need to squash right?