Added strict check and window load