Revert "Revert "Updated to work on stable""

This reverts commit b4d20ff0510059ebba726a0e8699559d6e8f4c05.