Performance improvement (680ms gain here)