included suggestions by JS