renaming field to avoid confusing and adding TODO note