revert changes made previouslly , bug # 96
fix for bug #99
fix for bug #106