Added edge functionality