Yamamon's final version

Refined model from yamamon’s final version.