impromenets requested by @hwellmann