migrating to s2.1