kit's changes - commented out