removed this if