basically redid everything lol