updated more with better plots