clean up
clean up
fix coordinate bug