Feature/en 1831

Style deprecated.