some concepts improvements