Fixed stalling bug! Way faster