Adding to edge-cases