updated factories to 2.0