MIX: Acting on mnot@'s feedback.