Added user preference check