working on applying my changes to framework