Made it faster