small changes in status and controller