Update in line with GUI requirements.