Modify according to new resoures