Changes done with Anna
Merging
Adjusting some vectors