Needs some suggestions

... so please add them.