Add changes from manphiz