updated with my settings