Use configure (23/24)

Use configure