Updated to working status