some enhancments