Better way to do it