Basis computation added