some small adaptions.