fixed the suggestions by @keflavich