merged previous changes