Latest changes from vbawol

Latest changes from vbawol