pulled
fixed some deprecation warnings
fixed some deprecation warnings