test
added controller and changed default values
merge