Updated for mono use