Related to Seekrit Commit #4

Faster Faster Faster!