Improved Version, but does not Converge. Need to Fix it