sorting out advanced mode a bit