Added a new (3rd) suggestion
fixed merge conflicts