[@Jollan] Accepted on both counts