improved o+ scenario