Improve my own helm functions