Second version

Some more comments added