Improved Efficiency

Down from 30s to 13s