Updated to work with mooltipass prototype