The whole following block is commented ? Needed ? If not, remove