Add comments for #184 #196