Some experimental changes causing unknown crash