Finally fixing speed up