added wall loading and better auto