Set 1_4 and some refactoring on 1_3