Updated Sametime (part 3)