Editted cotnroller a little bit to use new file