refactor using tap
change the painting format (again)