Some updated stuff for rain-maker.