Updated Sametime (part 1)