some additional changes to advanced-features