Update 1028

working on refactoring