partial fix in resources not complete
finished mashup