Tweaked the ways are processed