The New Master

I've just moved the changes that were made on the "Working - Master" to
the "Master". Only use this one.