Added the now famous buffer box