Removed some things to speed up process time