Updates for OPTI Toolbox 2
Make sure silly cases works