Jordan fix

Saw jordan make a branch with some changes.

These are amazing. Lets start a discussion about them!