update from upstream (where is that mystical upstream!)
complete - can has brains