second commit,fixed a silly mistake, lots pending