commented out some error checking code