Better specification of edge cases