Updated to work with changed windows titles.