trying to fix my complete mess with versioning