Use a better method