Much better acceleration (still with some bugs)