changed initial check