update 2 on issue5