[@TheHangedMan] I have updated Agatha's CS. Please review and let me know if it is ok. Thank you!