Better way of handling it