updated with latest preference changes