I still need to fix some border bug