before hopefully final update