Comment changed
Re-added additional validation