Final Changes to Framework