Changed the future usage so that it might be faster