changed some deprecation issues