Switch to using the Neil library