Enhancments before PR