More simplification implementation;