changes to work with latest melon.