Second edit

For when I merge