Uncommented some code to increase speed.