6th commit apgmbis 12Aug