changes as suggested by arne