refactored. changed some names