refactored a few things to improve continuity