bug fix & waste reduction