add TODO to find a effective way to iterate thought the shifts of a plan
template enhancements + change in models methods