some small modifications & correction for bodo