This could benefit from my suggested alternative above...