Major commit  complete reword