fixes in new infrastructure 2