Eliminating one token model + changes in display