simplified code and new status support