Updates from suggestions
Fix merge