Strimi 2.0 - Update #1