[MOD] NPE fix
[MOD] reorganizing,clearing up - intermediate state