Added Sasha's updates (fixup)