added the resource faze
more merging