I think the existing implementation is better