some todo added, controller