Trying to fix the modeling