[REFACTOR] st2