refactor
change with of run window