second version, back to version control