- Added handling for user's setting