Fixed resource bug
merged my changes