added updates from Sasha