TST-1 added change #5