Final updates...at last