Quick fix
Quick fix
Added status switching