added proper bw calcs