Revert "Revert "Final Commit (final expo)""

This reverts commit ca25db5f2da5cc924dfd684e6000747bdf2915d4.