Merged previous changes