UPDATED: Continued work on introducing bw management capabilities