merging panos' changes by hand
asdads