Swapped over to use INotify