[@Arthanus] I've updated the CS. If still unacceptable let me know.