Accidentally merged an older, out of date version of this file

This is the updated file