Optimization, added back entity debug BB