working on resources
working on resources
merge