new version
NPE fix
Cleanup
new version