improved border still working on the guards