Re adding some annotations
Merging