Added more chesk for valid content.