added status label and logic