Changed settings to be more generic