Converted to use sherpa and vibe changes