Working on removing feature where a matching buffer is used instead of opening inline