some design improvment on issues