Costa

Merging Final Branch with Costa's changes.