Added more version check code...