Added L-Q and improved Champion class