Fixed the basic model so it now works with the new embedding