Updates for new prod version. Tests not concluded