Tweaked numbers and prevented infinte loop