updates to changing speed, still bugs to fix