Some changes
VAM and poten deleted - no need