This just complicated the sample. Furthermore, it was unclear if the implementation was correct anyway.