Finish 3.6 advanced setup