Code refactored and bugs fixed
WC : design changed private