Framework - Update #1