watched, performance

added Watched-functionality, increased performance