added more checking..