Made changes requested by dirk-thomas