work on scm consistency