Another backup version before really merging the new version