Remade with debug symbols