refactored. Again