Dieta V2 Fix Merge