Slim mode
Fixing conflicts