Tweaked a few things here and there from the original