Switched to old approach temporarily (Aachen's old analytical shape)