changed how conditional is written