adding support for s9 to s12