4th commit apgmbis 12Aug