A bunch more stuff for the update