Added back more elements