added buffer and r buffer and remove feature