SR ADD style for 5.0
SR clean code