add drawBaw method
merge