some previous commits remaining