Mark's test update