13-15 and some refactor