Updates, per review from Jamie Diprose