integrate suggestions from Ferki (thanks\!)