Add doc and uncomment code