Type annotation
Merge neil changes