change to use controller, add kaminary