Revert "impelmenting #3"

This reverts commit a458493f7b9d96b27419efb11cf35d05c1918f27.
working on bug2

#7
fix #7