20130630-updated comments