First commit, but the second version of the system