Tuned after more feedback