updated to latest frameworks