status handling changes