Added state element to clean up display