Tweaks for first version