another stab at getting scm right