more changes to split stage and prod