Moved and fixed track end writing