Tweaked for release