Got rid of '_embedded'