Updated to work with scaled cartridges