First improvements for new version