An improvement over the previous version