Fixed: Opertimize implementation