updated via new buffalo