Re-adding my quick buffer switch map