few updates on addresses