Tweaked the framework