version 2 of testdrape