implemented Stephans change comments