ENH:finish part of controller