added basic check code!