changed threshold for now
fixed 1 bug