Moved to using blocks for display values