updated to use contentParse() & new libs