this may break tests, but I'm ok w/ the change