Include sell state and refactoring code