changed to contain dynamic IP
 merged