Updating: minor overall improvment.