Final check

Add some comments