Cleanup, add acceleration