More work on AdvComFab