this is the new commit for what I originally planned to be an amend