renamed and updated to match my config