why remove this condition? the name would be different between embedded mode and shared mode?