Merged with the more or less working version of LSR-TAS