Make both 4.0 & 4.1 users happy