Improvement on aforementioned