Update 2

More Improvs