Tweaked one or two things