conflict
readding check function