Fixed hang and added util to watch single system