Updated with some of my new configs from the C7