Merges George changes