Update on Leo's file, new classes