Moving Buffalo forward