Fix to function issue
Resolving incoming merge
Update notes