XLS source reworked and fixed