first attempt at full migration to flexible targets scheme