Minor refinment.