drawing box fixed
drawing box fixed and tested
fix conflicts