I've readded some comments