more changes related to migration to array-enhacements