changed TODO and validations