Updated to LyonPotpourri 3.0