Fix the slowness of the Deck file and other changes