Faster

Updated to not use constant memory allocations