Updated to latest archon/astyanax