Reverted recent changes to model