added oswald & normalize to embedded