Made changes to work with latest Wilson