Fixes by Lis
Regenerate
Add tapas