Slight reordering, cedet basic config