qzj/ab finished
merge changes