Simplified and doc update.