20140505: re-worked model