Updated with functioning version control