Adds a couple speed ups