Brian's second edit