Feedback from Addy
merge