minor refactoring
wrap around