total mess with two controller classes
totally mess with warnings
latter commit to master branch