Made it work faster