Thoughts? (right is the official, left is my changes)