Hope the changes are acceptable :)