Rewrite for new x out of y style displays