Everything back as it was in the first commit