Updated a bunch, and was a bit more specific as Nicolas said.