added the missed stuff
added missing stuff