Working on new version with resources.