added soa checks