two suggestions by Andreas