#2 - issue related changes