Added a few changes to reflect my official job title