Improvements on links to kevin