fixed bugs for Sheldon Levy