Hoping a dev comments on this