Some improcvements