Revert "Revert "fixed what i broke""

This reverts commit d75bd089645763c3bd7e1b95ca82d82dd3c693a9.