use minimal common code
further updates