merge mrdon's changes