Commit of haiku re-write