Changing commits. Some issues still there