Fix

Change back to use the original code, but add our own models