Fixed to dbarnett LP and TY and quiz