Tried to improve resource loading.