bugs fixed && test is done
bugs fixed && test is done