Updated with User preferences