7th commit apgmbis 12Aug