refactor according to ytx srs