Updated with new Cordstone stuff