Working towards automatic selection buffer