Added resources, formatting