merge from danny