finally fixing version control!!