Merged Oliver's changes