added controller and changed default values