Some improvements, but there is still a LOT OF PROBLEMS