now with embedded support