added controller, updated ouline