More work on essence regen