added missing file and finished feature 2