now it works much better...adding watch