Fixing my merge issues, should be Johns fixed code that I undid in merge ARGH