Better way to handle this?