Update w/ new kernel structures
Add bounds