some refactoring for 205