fixes + WatchPin saple