Implementing changes so Mark F can install