PC & MAC validated

PC & MAC validated