Updated current emuLib changes