Adding Orlando
Fix noninterrogative cleanup