Basically the same as last update, with a couple additions.