initial commit  (fully updated)