Revert "Revert "THIS IS FOR SOPHIA""

This reverts commit 31e07a85d476e63a1666d423e6f0a01e0fb057b2.