adjusting to latest framework version