Updated version of watchman simulation

Easier to read, easier to edit