Changed where version is checked. Hated the delay