Use configure (22/24)

Use configure