Daany's changes