Move these checks for adding new only