New and improved Buffalo
commented out the logging stuff