Changed several options to single revised diagram