Andrew added comment
Merge fixed