5th commit apgmbis 12Aug