major refactoring at blue state