[@Zelosse] Any chance you've had time to look over my revised CS?