more edits still little issue with buffering