Edit #1

Better