added more homesick self checking