Resources + a lot of changes