moved to resources with new models