Updates to reflect local settings - NO COMMIT TO MASTER