Added widow check