putting id check back