Some minor change
Pill by Simon
Fix conflict