Taking Dirk comments into account