removed id check