pre modular cases, attempted to fix case 3 bug