implement the changes dicussed on the issue tracker in github