Adding Linear-Quadratic BAT estimation + Additional Changes