Added buffers so that file reading stuff works