Change to chek for empty rather than size