better value mode support