added change status (it's ugly but it works)