editted

started from beginning