ag edited die to buffer conflicts, listmap added for better maptracking