Added hole term and spatial entropy term