Added toggle remap for buffergator