Fixed variable names, rearranged model