Make it faster! 55s -> 34s with these changes