some concepts improvements
some concepts improvements