WC one bug fixed and improve functionality