Some enhancments