view and controller merged; needs further check