Making it work for Wayne's changes