Added "end-proof" where needed.