merge Luke's changes