BorderDemo little closer to original