prepped for update
minor code refactor
commit for merge to v3
fixing conflict sorry