Merged with my old settings