@leo updates and comments