Enable s-plus building part III