improved embedding!