thanks! would you mind squashing these into a single commit?