A working version of the new model