fixing some previous changes