More work on Advanced Mode