Updated stuff and stuff