Update functions and introduce new watch script