Updated. Fixing a core dump now...