Updated Sametime (part 2)