Adrian's changes