My and Andreea's updates
Andreeas' updates