Fixed classes to reflect state