add listener to help make sure dirty change gets triggered properly
updating timeouts to 500 sec