Better way to do 30297eb