Concept and implementation modifications