Major improvement on model