Better way to handle it