Uncommented code from testing