Simplify

This PR simplifies original model