Added some sort of edge fail mechanism