cleanup and added bandwidth