resource handling changes