taking advantage of code merged in previous commit