some more updates from SpeakapBV