added elastic ip
simplified linking code