Merging from van's changes