Tweaks and new version