updating, still bugs