updated content from client and commented outline