re sumbit of initial refactor