Tweaked to be more like the original