Improvement on the previous concept.