maybe move this inside the elif branch?