Updated for my settings