Do you have a quick moment to try this? I think it'd be more maintainable and git trackable.