fixed new resources'
Merge branch 'patsy'