added missing commits, testling