Small modifications