revert addr init and use separate SP init