Improvement over previous commit