Extra conditional statements now with correct id

Extra conditional statements now with correct id