Added working borders