Small modifications here and there