[FIX] performance updates