Added Gerard's stuff