[SWANcom] Elmhurst update