cleaned version ready for usertest3