changed smth
resolved default controller conflict