IMplementing MIkes fixes.