raised version. minor refactoring