Previous commit didn't work, trying new approach.