Imported some changes by Ez3D

Some is the keyword.