modified view & logic