refactored with new version of indigofeather/resource-loader