about to delete old comments; reorganized code