Modified to not include buffer files