prepair for refactor