Final submission to AAMAS