improved embedding and added forwarding