Update: moved leosac class, fix #9