Added back comments deleted by mistake