Implement more anti-marvin&peter features.