Improved minimal mode