Moved things around for embed