merging in nialo's changes