Yes,the 21w is in an oval.I think It may have a serial on it starting with letter A.I will have to pull it out of the safe to check this evening.