Switched to pure_neat branch