Comments updated to work properly