latest changes to make it work although resource title needs to be updated