Changes to make everything faster