Tweaked stuff..