Update based on wiki